x86: Remove bogus variables on construct_dom0()

The check for supervisor_mode_kernel feature bit was being done on the
dom0_features_{supported,required} variables, but they are always set
to zero.

The feature bits are stored on elf_dom_parms struct, not on those
variables.

From: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index e0fb1967e20477ecb55b09f2cba650fb40bd2108..723174fa10ecdd57f1f0ae78eeb0f6ecd3218610 100644 (file)
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -252,10 +252,6 @@ int __init construct_dom0(
     /* Machine address of next candidate page-table page. */
     unsigned long mpt_alloc;
 
-    /* Features supported. */
-    uint32_t dom0_features_supported[XENFEAT_NR_SUBMAPS] = { 0 };
-    uint32_t dom0_features_required[XENFEAT_NR_SUBMAPS] = { 0 };
-
     /* Sanity! */
     BUG_ON(d->domain_id != 0);
     BUG_ON(d->vcpu[0] == NULL);
@@ -942,12 +938,12 @@ int __init construct_dom0(
         v->arch.guest_context.user_regs.gs &= ~3;
         printk("Dom0 runs in ring 0 (supervisor mode)\n");
         if ( !test_bit(XENFEAT_supervisor_mode_kernel,
-                       dom0_features_supported) )
+                       parms.f_supported) )
             panic("Dom0 does not support supervisor-mode execution\n");
     }
     else
     {
-        if ( test_bit(XENFEAT_supervisor_mode_kernel, dom0_features_required) )
+        if ( test_bit(XENFEAT_supervisor_mode_kernel, parms.f_required) )
             panic("Dom0 requires supervisor-mode execution\n");
     }